Fix tolerations not parsing its options correctly, update docs regarding quoted driver options #1053
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@tonistiigi @AkihiroSuda this should fix the issue raised by @ktaborski in #1045 |
|
Can we have a unit test? |
|
@AkihiroSuda @szeber any updates regarding this? |
|
edit: confirming this branch fixes my issues with current master `invalid syntax`
FYI, when I quote as suggested here (running current # wrong quotes
$ /usr/bin/docker buildx create --name builder-aead224e-ed8e-49fc-ad7c-b7232da1b586 --driver kubernetes --driver-opt tolerations="key=arch,value=arm64,operator=Equal,effect=NoSchedule" --driver-opt namespace=docker-buildx --driver-opt replicas=1 --driver-opt requests.cpu=1m --driver-opt limits.memory=2Gi --driver-opt nodeselector=kubernetes.io/arch=arm64 --driver-opt rootless=true --driver-opt qemu.install=true --buildkitd-flags --allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host --use
error: parse error on line 1, column 13: bare " in non-quoted-field
...
# wrong quotes
$ /usr/bin/docker buildx create --name builder-84bc1c8c-e0a5-48d8-9269-409422fa4490 --driver kubernetes --driver-opt 'tolerations="key=arch,value=arm64,operator=Equal,effect=NoSchedule"' --driver-opt namespace=docker-buildx --driver-opt replicas=1 --driver-opt requests.cpu=1m --driver-opt limits.memory=2Gi --driver-opt nodeselector=kubernetes.io/arch=arm64 --driver-opt rootless=true --driver-opt qemu.install=true --buildkitd-flags --allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host --use
error: parse error on line 1, column 14: bare " in non-quoted-field
...
# wrong quotes
$ /usr/bin/docker buildx create --name builder-123f035e-7fcc-4c81-b046-8ffadcb12833 --driver kubernetes --driver-opt "tolerations=\"key=arch,value=arm64,operator=Equal,effect=NoSchedule\"" --driver-opt namespace=docker-buildx --driver-opt replicas=1 --driver-opt requests.cpu=1m --driver-opt limits.memory=2Gi --driver-opt nodeselector=kubernetes.io/arch=arm64 --driver-opt rootless=true --driver-opt qemu.install=true --buildkitd-flags --allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host --use
error: parse error on line 1, column 15: extraneous or missing " in quoted-field
...
# quotes as suggested here, getting invalid syntax error
$ /usr/bin/docker buildx create --name builder-12f140fa-5dd7-45f7-87b2-59ceacbfe3fb --driver kubernetes --driver-opt "tolerations=key=arch,value=arm64,operator=Equal,effect=NoSchedule" --driver-opt namespace=docker-buildx --driver-opt replicas=1 --driver-opt requests.cpu=1m --driver-opt limits.memory=2Gi --driver-opt nodeselector=kubernetes.io/arch=arm64 --driver-opt rootless=true --driver-opt qemu.install=true --buildkitd-flags --allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host --use
builder-12f140fa-5dd7-45f7-87b2-59ceacbfe3fb
$ /usr/bin/docker buildx inspect --bootstrap --builder builder-12f140fa-5dd7-45f7-87b2-59ceacbfe3fb
Name: builder-12f140fa-5dd7-45f7-87b2-59ceacbfe3fb
Driver: kubernetes
Nodes:
Name: builder-12f140fa-5dd7-45f7-87b2-59ceacbfe3fb0
Endpoint: kubernetes:///builder-12f140fa-5dd7-45f7-87b2-59ceacbfe3fb?deployment=&kubeconfig=
Driver Options: limits.memory=2Gi
, namespace=docker-buildx
, nodeselector=kubernetes.io/arch=arm64
, qemu.install=true
, replicas=1
, requests.cpu=1m
, rootless=true
, tolerations=key=arch,value=arm64,operator=Equal,effect=NoSchedule
Error: invalid syntax
$ /usr/bin/docker buildx bake --file docker-compose.yml --set *.platform=linux/amd64 --set *.platform=linux/arm64 --metadata-file /tmp/docker-build-push-orx3PF/metadata-file
error: no valid drivers found: invalid syntax |
|
hey, i'll try to get a test in this today |
|
@tonistiigi @AkihiroSuda Added some tests, it required a bit of refactoring of the factory to make this properly testable |
|
Please squash commits |
szeber
force-pushed
the
kubernetes-tolerations-fix
branch
from
b9111ad
to
4d88bde
Compare
|
@AkihiroSuda squashed |
|
@szeber could you fix merge conflicts? |
Signed-off-by: Zsolt <[email protected]>
szeber
force-pushed
the
kubernetes-tolerations-fix
branch
from
4d88bde
to
4a22656
Compare
|
@ddelange fixed, it was fixing the same bug as i was :D Correction. One of the same bugs as I was, this fixes other things too :) |
tonistiigi
approved these changes
Apr 22, 2022
AkihiroSuda
approved these changes
Apr 22, 2022
|
@crazy-max is there an expected release date planned? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Followup for #1045. Updates the docs with correct examples on how to quote multiple node selectors or tolerations and removes unquoting from the tolerations, since the CSV parser that parses the driver-opts already handles unquoting.